Plug some memory leaks

Make sure the scroll controllers in GtkComboBox and GtkScrolledWindow
get destroyed.

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index dced3d7df0c282a76fd2c9d4952c0a76f2cdd1f0..633099d8c3bae4c8db8326fa327db8bd2cb262d4 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2803,6 +2803,8 @@ gtk_combo_box_dispose (GObject* object)
   GtkComboBox *combo_box = GTK_COMBO_BOX (object);
   GtkComboBoxPrivate *priv = combo_box->priv;
 
+  g_clear_object (&priv->scroll_controller);
+
   if (priv->popup_widget)
     {
       /* Stop menu destruction triggering toggle on a now-invalid button */

diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 52fbd20b2fa3966496c27b50da649b2b0d310fd7..9d89da1f4a958eb30a19f696d207740c48a2cee4 100644 (file)
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -2642,6 +2642,8 @@ gtk_scrolled_window_finalize (GObject *object)
   g_clear_object (&priv->swipe_gesture);
   g_clear_object (&priv->long_press_gesture);
   g_clear_object (&priv->pan_gesture);
+  g_clear_object (&priv->scroll_controller);
+
 
   G_OBJECT_CLASS (gtk_scrolled_window_parent_class)->finalize (object);
 }